package  com.baizhi;

public class  hello{
	public static  void  main(String[] args){
<<<<<<< HEAD
		System  out println ("hello  master");
=======
		System  out println ("hello  ZhangSan");
>>>>>>> zhangsan
		System  out println ("hello");
		System  out println ("hello");
	}
}